Revision: bazaar--devel--1.2--patch-43
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Feb  3 22:00:53 EST 2005
Standard-date: 2005-02-03 11:00:53 GMT
New-files: .arch-ids/=merges.id =merges
Modified-files: ChangeLog libarch/apply-changeset.c
    libarch/diffs.c libarch/inv-ids.c tests/test-merge.sh
New-patches: lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-1
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-3
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-6
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-7
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-8
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-9
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-10
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-11
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-12
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-13
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-14
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-15
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-16
    lord@emf.net--gnu-arch-2004/tla--devo--1.3--version-0
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-43
Summary: sync up with tla 1.3
Keywords: 

Patches applied:

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-1
   Massive Log Pruning

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-3
   restore recent ancestry patch logs

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-6
   avoid unnecessary remote connections in 'tla changes'

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-7
   fix regressions in 'tla get-changeset'

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-8
   prevent getting from invalid archives

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-9
   only regular files, symlinks, and directories should be source

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-10
   fix "one-way" star-merge bug

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-11
   add =merges file

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-12
   remove misplaced patch logs

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-13
   allow patch logs from archives beginning with a numeric

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-14
   don't hard code explicit in =tagging-methods

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-15
   always use --binary option for diff and patch

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-16
   fixed diff3 --binary bug

 * lord@emf.net--gnu-arch-2004/tla--devo--1.3--version-0
   tla-1.3 released

